Water Physics Overhaul